Autogenerated HTML docs for v1.8.1.1-293-gfe737
diff --git a/RelNotes/1.8.1.2.txt b/RelNotes/1.8.1.2.txt new file mode 100644 index 0000000..76ad0b3 --- /dev/null +++ b/RelNotes/1.8.1.2.txt
@@ -0,0 +1,13 @@ +Git 1.8.1.2 Release Notes +========================= + +Fixes since v1.8.1.1 +-------------------- + + * "git archive" did not record uncompressed size in the header when + streaming a zip archive, which confused some implementations of unzip. + + * When users spelled "cc:" in lowercase in the fake "header" in the + trailer part, "git send-email" failed to pick up the addresses from + there. As e-mail headers field names are case insensitive, this + script should follow suit and treat "cc:" and "Cc:" the same way.
diff --git a/RelNotes/1.8.2.txt b/RelNotes/1.8.2.txt index 78820ac..f6d1505 100644 --- a/RelNotes/1.8.2.txt +++ b/RelNotes/1.8.2.txt
@@ -46,6 +46,9 @@ * "git cherry-pick" can be used to replay a root commit to an unborn branch. + * "git commit" can be told to use --cleanup=whitespace by setting the + configuration variable commit.cleanup to 'whitespace'. + * "git fetch --mirror" and fetch that uses other forms of refspec with wildcard used to attempt to update a symbolic ref that match the wildcard on the receiving end, which made little sense (the @@ -62,6 +65,10 @@ allows patches from rerolled series to be stored under different names and makes it easier to reuse cover letter messsages. + * "git log" and friends can be told with --use-mailmap option to + rewrite the names and email addresses of people using the mailmap + mechanism. + * "git push" now requires "-f" to update a tag, even if it is a fast-forward, as tags are meant to be fixed points.
diff --git a/config.txt b/config.txt index ef45c99..b87f744 100644 --- a/config.txt +++ b/config.txt
@@ -923,6 +923,15 @@ Specify whether to output tag listing in `git tag` in columns. See `column.ui` for details. +commit.cleanup:: + This setting overrides the default of the `--cleanup` option in + `git commit`. See linkgit:git-commit[1] for details. Changing the + default can be useful when you always want to keep lines that begin + with comment character `#` in your log message, in which case you + would do `git config commit.cleanup whitespace` (note that you will + have to remove the help lines that begin with `#` in the commit log + template yourself, if you do this). + commit.status:: A boolean to enable/disable inclusion of status information in the commit message template when using an editor to prepare the commit @@ -1525,6 +1534,10 @@ Tools like linkgit:git-log[1] or linkgit:git-whatchanged[1], which normally hide the root commit will now show it. True by default. +log.mailmap:: + If true, makes linkgit:git-log[1], linkgit:git-show[1], and + linkgit:git-whatchanged[1] assume `--use-mailmap`. + mailmap.file:: The location of an augmenting mailmap file. The default mailmap, located in the root of the repository, is loaded
diff --git a/git-commit.html b/git-commit.html index fc31e13..1e46816 100644 --- a/git-commit.html +++ b/git-commit.html
@@ -1066,7 +1066,9 @@ only if the message is to be edited. Otherwise only whitespace removed. The <em>verbatim</em> mode does not change message at all, <em>whitespace</em> removes just leading/trailing whitespace lines - and <em>strip</em> removes both whitespace and commentary. + and <em>strip</em> removes both whitespace and commentary. The default + can be changed by the <em>commit.cleanup</em> configuration variable + (see <a href="git-config.html">git-config(1)</a>). </p> </dd> <dt class="hdlist1"> @@ -1562,7 +1564,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2012-11-15 13:11:54 PST +Last updated 2013-01-20 18:01:21 PST </div> </div> </body>
diff --git a/git-commit.txt b/git-commit.txt index 7bdb039..41b27da 100644 --- a/git-commit.txt +++ b/git-commit.txt
@@ -179,7 +179,9 @@ only if the message is to be edited. Otherwise only whitespace removed. The 'verbatim' mode does not change message at all, 'whitespace' removes just leading/trailing whitespace lines - and 'strip' removes both whitespace and commentary. + and 'strip' removes both whitespace and commentary. The default + can be changed by the 'commit.cleanup' configuration variable + (see linkgit:git-config[1]). -e:: --edit::
diff --git a/git-config.html b/git-config.html index 84ce813..4244ea7 100644 --- a/git-config.html +++ b/git-config.html
@@ -2710,6 +2710,20 @@ </p> </dd> <dt class="hdlist1"> +commit.cleanup +</dt> +<dd> +<p> + This setting overrides the default of the <code>--cleanup</code> option in + <code>git commit</code>. See <a href="git-commit.html">git-commit(1)</a> for details. Changing the + default can be useful when you always want to keep lines that begin + with comment character <code>#</code> in your log message, in which case you + would do <code>git config commit.cleanup whitespace</code> (note that you will + have to remove the help lines that begin with <code>#</code> in the commit log + template yourself, if you do this). +</p> +</dd> +<dt class="hdlist1"> commit.status </dt> <dd> @@ -4165,6 +4179,15 @@ </p> </dd> <dt class="hdlist1"> +log.mailmap +</dt> +<dd> +<p> + If true, makes <a href="git-log.html">git-log(1)</a>, <a href="git-show.html">git-show(1)</a>, and + <a href="git-whatchanged.html">git-whatchanged(1)</a> assume <code>--use-mailmap</code>. +</p> +</dd> +<dt class="hdlist1"> mailmap.file </dt> <dd>
diff --git a/git-log.html b/git-log.html index 9d81068..37beb06 100644 --- a/git-log.html +++ b/git-log.html
@@ -811,6 +811,16 @@ </p> </dd> <dt class="hdlist1"> +--use-mailmap +</dt> +<dd> +<p> + Use mailmap file to map author and committer names and email + to canonical real names and email addresses. See + <a href="git-shortlog.html">git-shortlog(1)</a>. +</p> +</dd> +<dt class="hdlist1"> --full-diff </dt> <dd> @@ -3714,7 +3724,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2013-01-06 01:05:36 PST +Last updated 2013-01-20 18:01:21 PST </div> </div> </body>
diff --git a/git-log.txt b/git-log.txt index 08a185d..22c0d6e 100644 --- a/git-log.txt +++ b/git-log.txt
@@ -47,6 +47,11 @@ Print out the ref name given on the command line by which each commit was reached. +--use-mailmap:: + Use mailmap file to map author and committer names and email + to canonical real names and email addresses. See + linkgit:git-shortlog[1]. + --full-diff:: Without this flag, "git log -p <path>..." shows commits that touch the specified paths, and diffs about the same specified
